Set the image of a button proxy to the "icon-name" property.

        * gtk/gtkaction.c (connect_proxy): Set the image of a button
        proxy to the "icon-name" property.

        (gtk_action_set_short_label):  If the "image" property is set
        on the button proxy, also tries to set the "label" property on
        the GtkButton.

svn path=/trunk/; revision=20363

diff --git a/ChangeLog b/ChangeLog
index 348686fb3544bc96cedbea264d130d8fa3d87ad9..181f038d857da7edafe8524b1ecbd86182be85a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 517706 – Connecting GtkButton with "use-stock" == FALSE to a
+       GtkAction has problems
+       Patch by Peter Johanson
+
+       * gtk/gtkaction.c (connect_proxy): Set the image of a button
+       proxy to the "icon-name" property.
+
+       (gtk_action_set_short_label):  If the "image" property is set 
+       on the button proxy, also tries to set the "label" property on 
+       the GtkButton.
+
 2008-06-12  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkmain.c

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index f7d3a7ad3481b7320f414fe1a898bc66d39cc783..08047f105f25e4ea4557b3503f479123efb0b378 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -817,7 +817,12 @@ connect_proxy (GtkAction     *action,
        }
       else 
        {
-         if (GTK_BIN (proxy)->child == NULL || 
+         GtkWidget *image;
+
+         image = gtk_button_get_image (GTK_BUTTON (proxy));
+
+         if (GTK_IS_IMAGE (image) ||
+             GTK_BIN (proxy)->child == NULL || 
              GTK_IS_LABEL (GTK_BIN (proxy)->child))
            {
              /* synchronise the label */
@@ -826,6 +831,12 @@ connect_proxy (GtkAction     *action,
                            "use-underline", TRUE,
                            NULL);
            }
+
+         if (GTK_IS_IMAGE (image) &&
+             (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY ||
+              gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME))
+           gtk_image_set_from_icon_name (GTK_IMAGE (image),
+                                         action->private_data->icon_name, GTK_ICON_SIZE_MENU);
        }
       /* we leave the button alone if there is a custom child */
       g_signal_connect_object (proxy, "clicked",
@@ -1379,9 +1390,13 @@ gtk_action_set_short_label (GtkAction    *action,
       else if (GTK_IS_BUTTON (proxy) &&
               !gtk_button_get_use_stock (GTK_BUTTON (proxy)))
        {
+         GtkImage *image;
          child = GTK_BIN (proxy)->child;
+
+         image = gtk_button_get_image (GTK_BUTTON (proxy));
          
-         if (child == NULL || GTK_IS_LABEL (child))
+         if (GTK_IS_IMAGE (image) ||
+             child == NULL || GTK_IS_LABEL (child))
            gtk_button_set_label (GTK_BUTTON (proxy), 
                                  action->private_data->short_label);
        }